Merge from mainline.
authorKatsumi Yamaoka <yamaoka@jpl.org>
Mon, 19 Apr 2010 22:42:15 +0000 (22:42 +0000)
committerKatsumi Yamaoka <yamaoka@jpl.org>
Mon, 19 Apr 2010 22:42:15 +0000 (22:42 +0000)
commit4f78bdc2453684c167987aef427852a1ae466ed9
treeba107764bb3716526a4ea8bf112be5e8cc870619
parentd1e5eaeffcf5ba66d66d12f305d7ab5289e09471
parentb8de93ebd4e413af9d463003483010007e2f2d69
Merge from mainline.